Revert 21641:2e5844e17d6f "xencommons: modprobe xenfs if it not be loaded"

Nacked by Jeremy Fitzhardinge and Ian Jackson.

Signed-off-by: Keir Fraser <keir.fraser@citrix.com>

diff --git a/tools/hotplug/Linux/init.d/xencommons b/tools/hotplug/Linux/init.d/xencommons
index 6885cb924c8b5d06f6667a4910a5f0acf1a4c230..d8680fba02d4a4e39e96881448b1adf0de222f99 100644 (file)
--- a/tools/hotplug/Linux/init.d/xencommons
+++ b/tools/hotplug/Linux/init.d/xencommons
@@ -24,21 +24,16 @@ test -f /etc/sysconfig/xencommons && . /etc/sysconfig/xencommons
 XENCONSOLED_PIDFILE=/var/run/xenconsoled.pid
 shopt -s extglob
 
-if test "x$1" = xstart; then
-       if ! grep '     xenfs$' /proc/filesystems >/dev/null; then
-               test -x /sbin/modprobe && /sbin/modprobe xenfs 2>/dev/null
-       fi
-       if test -d /proc/xen && \
-           ! test -d /proc/xen/capabilities && \
-             grep '    xenfs$' /proc/filesystems >/dev/null && \
-           ! grep '^xenfs ' /proc/mounts >/dev/null;
-       then
-               mount -t xenfs xenfs /proc/xen
-       fi
+if test "x$1" = xstart && \
+     test -d /proc/xen && \
+   ! test -d /proc/xen/capabilities && \
+     grep '    xenfs$' /proc/filesystems >/dev/null && \
+   ! grep '^xenfs ' /proc/mounts >/dev/null;
+then
+       mount -t xenfs xenfs /proc/xen
 fi
 
-if ! test -e /proc/xen/capabilities || \
-    ! grep -q "control_d" /proc/xen/capabilities ; then
+if ! grep -q "control_d" /proc/xen/capabilities ; then
        exit 0
 fi